[flang][Evaluate] Restrict ConstantBase constructor overload #138456
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ConstantBase has a constructor that takes a value of any type as an input: template <typename T> ConstantBase(const T &). A derived type Constant<T> is a member of many Expr<T> classes (as an alternative in the member variant). When trying (erroneously) to create Expr<T> from a wrong input, if the specific instance of Expr<T> contains Constant<T>, it's that constructor that will be instantiated, leading to cryptic and unexpected errors. Eliminate the constructor from overload for invalid input values to help produce more meaningful diagnostics.
llvmbot
added
flang
Member
|
@llvm/pr-subscribers-flang-semantics Author: Krzysztof Parzyszek (kparzysz) ChangesConstantBase has a constructor that takes a value of any type as an input: template <typename T> ConstantBase(const T &). A derived type Constant<T> is a member of many Expr<T> classes (as an alternative in the member variant). When trying (erroneously) to create Expr<T> from a wrong input, if the specific instance of Expr<T> contains Constant<T>, it's that constructor that will be instantiated, leading to cryptic and unexpected errors. Eliminate the constructor from overload for invalid input values to help produce more meaningful diagnostics. Full diff: https://github.com/llvm/llvm-project/pull/138456.diff 1 Files Affected:
diff --git a/flang/include/flang/Evaluate/constant.h b/flang/include/flang/Evaluate/constant.h
index 6fc22e3b86aa2..d4c6601c37bca 100644
--- a/flang/include/flang/Evaluate/constant.h
+++ b/flang/include/flang/Evaluate/constant.h
@@ -110,8 +110,12 @@ class ConstantBase : public ConstantBounds {
using Result = RESULT;
using Element = ELEMENT;
- template <typename A>
+ // Constructor for creating ConstantBase from an actual value (i.e.
+ // literals, etc.)
+ template <typename A,
+ typename = std::enable_if_t<std::is_convertible_v<A, Element>>>
ConstantBase(const A &x, Result res = Result{}) : result_{res}, values_{x} {}
+
ConstantBase(ELEMENT &&x, Result res = Result{})
: result_{res}, values_{std::move(x)} {}
ConstantBase(
|
klausler
approved these changes
May 6, 2025
GeorgeARM
pushed a commit
to GeorgeARM/llvm-project
that referenced
this pull request
May 7, 2025
…8456) ConstantBase has a constructor that takes a value of any type as an input: template <typename T> ConstantBase(const T &). A derived type Constant<T> is a member of many Expr<T> classes (as an alternative in the member variant). When trying (erroneously) to create Expr<T> from a wrong input, if the specific instance of Expr<T> contains Constant<T>, it's that constructor that will be instantiated, leading to cryptic and confusing errors. Eliminate the constructor from overload for invalid input values to help produce more meaningful diagnostics.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
ConstantBase has a constructor that takes a value of any type as an input: template ConstantBase(const T &). A derived type Constant is a member of many Expr classes (as an alternative in the member variant).
When trying (erroneously) to create Expr from a wrong input, if the specific instance of Expr contains Constant, it's that constructor that will be instantiated, leading to cryptic and unexpected errors.
Eliminate the constructor from overload for invalid input values to help produce more meaningful diagnostics.